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

Change-Id: Ifdb9c356d1be07ad20813ef305d4bc8d9cee222a