Merge "Update ConnectivityCheckTargetPreparer references"