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

Change-Id: Ied90025357516105f6aecae1bcdb329e2ad2be89