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

Change-Id: Ie141154091497cb5018548de27aa2333d2609ec2