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

Change-Id: I161fc2a9c5c87b0f794ac2b279765f200d1f9bd2