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

Change-Id: I040acde299d9f3e7556a2dd9393080aabfa20936