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

Change-Id: Ia75b24b27902be11c28a1d143275ee38826a1e41