[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 346d27382b  -s ours
am: 11bf4ed50b  -s ours

Change-Id: I52c7c0c370c9173397e48f5cfca7557d3b80cb43