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

Change-Id: Ib75d8a6996b76d9251bbb537f3d17d7b35dd4276