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

Change-Id: I5886b0b61ee80a38cc75dff1275e6b224cc135a9