Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" into sc-dev