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

Change-Id: I6a7715041e6c113d464fd2f9abebbd5ed3cea527