Merge "Update references to sdkextensions cts"