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

Change-Id: Ia62aaac7b1bc3d68802135b7f6a99973dcf61be1