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

Change-Id: I368e02eb1e891c93d5d9e6f40ec6ac961b70ba92