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

Change-Id: I1eb46c7ada3632c324ae47d6bf7d344b058db3a7