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

Change-Id: I21144526c5871aaf32a6327355b18b27c733ad05