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

Change-Id: I97654d761ce1ecdb93a3af75ab5c01ea7b01f96b