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

Change-Id: I703ad4ce18a1146847e6cf354eb17c02601e3a60