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

Change-Id: Ic0ba68f6dcc9cddb81641663c4a9961917f845d2