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

Change-Id: If00462d3302e49847ec4c11fbc8ed68f969b3a27