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

Change-Id: Id1397644a75d796243b0ab065f0b1504ed29acb3