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

Change-Id: Idf4b40d45c02727a38defc0e5f540ac1788516b5