Merge "Reinstate much-reduced ConnectivityService logging." into nyc-dev