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

Change-Id: I26c1a4a9747ea0954bd4983a3212f3250839dcd9