Merge "Use ConnectivityCheckTargetPreparer in CTS"