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

Change-Id: Ic933d7c1ee67c75f0ffde669c32a95f0b21e6e23