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

Change-Id: I94ea9afea5fcc8fd1cef6abad041b5dc900cbbfb