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

Change-Id: Ic1411e8c56ee9c867d278b212e2c6dfe4a283472