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

Change-Id: Ied6b913a887017fc8b4d352e31816fd8d46d88a4