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

Change-Id: I830af8f6ec8ed6d976e231954d8c98971c55de29