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

Change-Id: If972576bb4ba196a404bb53678a6b36d34e61b5c