Merge "Add logging to track down weird ConnectivityManager issue."