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

Change-Id: I312a1382fbd979de4ab25e25b5ed4bfb84bdd696