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

Change-Id: I440f911da9e9a9ed0f9b4489316685172b71b13d