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

Change-Id: Icbedb8c4da070a6769cf4e871d93fcb216d4e2f8