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

Change-Id: I5a7af16a93a96d7a220f6cf9e2b5d55e9889f2fc