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

Change-Id: I6900e7c06996b85dae356a127a71f0d91e56acb6