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

Change-Id: Ic60b5849114148c3652bf013ad53bd8239773bf2