Merge "Update for sdk drop" into pi-dev