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

Change-Id: I7da6ae5b57f75b4c73d3c883c3850297943ea349