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

Change-Id: I0ba6bf8ab80babed9d86ef028fa2610733b6a4d2