Merge "Remove connectivity dependency on Preconditions"