Merge changes I8de95add,Ia6f4ccfd into nyc-dev
am: 24b6e2b

* commit '24b6e2bcc88ed6e142eae8ebd11cb90a70da588f':
  Remove unused event tags of IpConnectivityEvent
  Better ConnectivityMetricsEvent printing

Change-Id: I57ce8977a481d3c9a441ea4dab407ec367e3adca