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

Change-Id: I07e587b26f12e66f4eb98c8efa708bc150ae2cfc