[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
am: bf2e630154  -s ours

Change-Id: I242acf8f91d8935a0d236c40ca4a47f6ee80b0da