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

Change-Id: Idebee2c4c7a20e2d2023191214f8e90fd8051924