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

Change-Id: I6d436dbffa50417b919a4c7915e94e478f82bb31