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

* commit 'b99d6af3ab406db14d161cdc0000ed521957d7ca':
  Expand NetworkMonitor metrics

Change-Id: I6fad2c6fa68c42d161f90abedf83624379b48c8d