[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: 83a2d2922f  -s ours

Change-Id: I67731bdbecb589b469c1fdca430824f689ed9157