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

Change-Id: I9dd71211a0340a65c278421ae7e7b9df73843bf1