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

Change-Id: Ic73ecc30ed538a63dad4bee5bb7e3cb53dd66e73