[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: f7c4c1a8 -s ours am: 5957f4b0 -s ours Change-Id: Idcecbd86c2409a1d7521ffee3fd1afba2fe3d59f