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

Change-Id: Ia817434544a5c3bf1593d62e4f8914e29c54abc2