[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 531348c917  -s ours
am: 2970e4846c  -s ours

Change-Id: Ibe80ad8a60c74e954623c543607573491754cd2e