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

Change-Id: I17c7ee5d2bfe88556cfc4f513ad4e7ce97a580cc