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

Change-Id: I0c3ecf62577c863a1cb58dd5f5eccc568ed880a0