Merge "Update CTS for new FUSED_PROVIDER"