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

Change-Id: Ib8691e82fa492ec71e6295d0a46d8a2600218acd