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

Change-Id: I4eed68a0a5f001a58f952b21aefeae58416a3694