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

Change-Id: I757fd417064b306e32a5c544560de9e79ea1dc3b