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

Change-Id: I3d1bd9a16841e01eb003e2ffa764c305c0aa0b51