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

Change-Id: If677da2091a1aa81e9d46dc4f2e16faa7d9163b7