Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de
am: 9fc5843fa8

* commit '9fc5843fa837c53e9d95733fe74c429e49beb460':

Change-Id: I7d2861350744e3bdefe6f4315d9a6de79d136e1c