Merge "Update references to sdkextensions cts"
am: 2c54508955

Change-Id: Ida3ecddc5732d67cc4a8958dc850315885a43402