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

Change-Id: I3523462ec2733d8b403ced5a108dffec2ff9fcad