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

Change-Id: I3ea82de14200d20303473dc50fc37b91c2d90924