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

Change-Id: I5325b514dc1f9069c1f781cb1443edbbe1fd174c