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

Change-Id: I060f030604b8fe535edc4ec957e859fc6dd6832a