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

Change-Id: Iacae0d7dbc608d96ae238e441d191d20242d8148