Merge "Update reference to sdkextensions post move"