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

Change-Id: I29c6b7205c591439caed187a4a4e51a4044646c8