Merge pi-platform-release to stage-aosp-master - DO NOT MERGE

Change-Id: Ibdbef72fcbee2eb6688f526e353f7244b93df734