Merge "Expand NetworkMonitor metrics" into nyc-dev am: b99d6af3ab
am: 0f155c5778

* commit '0f155c5778ed54f3e8dbc579e2709bde1871a46c':
  Expand NetworkMonitor metrics

Change-Id: I476c70c47b85b4ed672156749d371e9092fb869b