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

Change-Id: I94eadb5b85112e076e87398a1661e39b513b992d