Merge "Update ConnectivityCheckTargetPreparer references" into udc-mainline-prod