Merge "Adding self-managed connection service APIs."