Merge "Revert "Remove connectivity dependency on Preconditions""