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

Change-Id: I97634ed61beb4176fb54b2bea87419d0b644cdc4