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

Change-Id: If9ce7ff743cf1f167fa7084a0f4c0c8d93d8512b