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

Change-Id: Ia24d7274dfc50e98a69badae7903771276566cb3