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

Change-Id: I599c00e3252ed717e178cd10910852db8164e3d3