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

Change-Id: I5044fe0536d91ca8b55e478430faddc7fc63eaa5