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

Change-Id: I937a54074ea263b36de057ffe5aa687a3d7bb358