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

Change-Id: Icfe1d70d1559871edaf246213fa198f23803541c