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

Change-Id: Ie69d412d0a40816081d4639563c27ad8eb9e296f