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

Change-Id: Iddb783b7860ba6da04691e2ced11b4ff66fd07cb