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

Change-Id: Iff0e3acc7f7be2aef7b4d536f6123ce5015b1d31