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

Change-Id: I7ebb861ad4c71cf764f226dc2a7b81576ff4b6bd