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

Change-Id: I2f78f45f967461df7013045d6476b3ece90b82cf