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

Change-Id: I336cff6d64b09b6f627897384c233bfd8d93d903