Merge "Expand NetworkMonitor metrics" into nyc-dev am: b99d6af3ab
am: 50f963f022

* commit '50f963f022e2a847a6218f6ec182f9503854f551':
  Expand NetworkMonitor metrics

Change-Id: I1cd1240937d79c194c885caaf5304a0b761c293b