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

Change-Id: I09fa1008fd8ffdc52d7ed3de648fc846ad920c0b