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

Change-Id: Ic08dcd0ddde7526da7ced97e3fedcc5c64fd7fe0