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

Change-Id: I98b06efb684ebfb5225411b562b8ab1b5c8e7ea2