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

Change-Id: I14420a4f8a2c384ce8020cb36f057f12b996e6e5