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

Change-Id: I63446f7bee5d1c483a6bbf52e6c5400abb904289