Merge "Fix linter errors in NetworkMonitor" am: 2e1d80d4e7
am: 81554a871b

Change-Id: I615c133c5559731f249640151d2b82e357e38807