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

Change-Id: Ib4e82146f69bf47a3c9821bf2557e0abdf7224d0