[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: e1038fd0 -s ours am: 21957001 -s ours Change-Id: Ie4566afd0b18c586e5f804966877fa989787db4c