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

Change-Id: I6e8df61a1e97e27fc3fa7abdd5432fb7b39cd802