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

Change-Id: I5fe5fc066c40a7d5e77371f8262a9b0a6ba726f7