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

Change-Id: If2e05a034792155212390a4d27129977316135e1