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

Change-Id: Iaca93cea5abc02be7308c3755e01047733fe087b