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

Change-Id: I44dc6176ebd8e329a37bc50e82478d5715243d23