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

Change-Id: I57ff6c0bd31c88bbc21104f545b90025849a6bae