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

Change-Id: Ibb5a677876d935352e8f7e4bc0b9d0c844d27118