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

Change-Id: I445fa6bc3cdcd97717b5f9dfdb9a0782c752516a