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

Change-Id: Ifc5493674ba3aece786b22f7b4567786aa9130cf