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

Change-Id: I6ec11123fd9febb9c31864b6c66c4bf5b10eabe9