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

Change-Id: I0704c99160f99ba60053bb5c842faa8b71d71359