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

Change-Id: I6e6bcbd523b83f83bde616bba172c6ec12b3519d