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

Change-Id: Ia2a8de533350b985490058ae33e7ce024bc05281