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

Change-Id: I1099a0634cb143d85c41af607333918436ed9b9e