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

Change-Id: I3cc95f0834810101b46616b5e4809207b506016d