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

Change-Id: I8f33b4d8c549059685ef02d175a23df06fcf496c