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

Change-Id: Iecd9e2eb77007f27fe611714c9de195837581464