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

Change-Id: Ib21d7ac51c423ee17e257e917d5389b528f63c1c