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

Change-Id: I1efc872100900d0eaa932e5824c96630eb10fbbc