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

Change-Id: Ideb7c8568977360f904a032b7480aed2b830cbc7