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

Change-Id: I943e6dfc72d3662a1869320dcea6e2bfca96a544