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

Change-Id: I310d615ac49d70965ca3b5360edabfe8bc4f4fe9