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

Change-Id: Ida68a68f91bee6a12a05f5f2f11a8530c39a9be2