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

Change-Id: If1ea80ca1b713e201b495c934736f8d467ddbc78