Merge "Some fixes in ConnectivityService event logging" into nyc-dev