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

Change-Id: Ib68082423e4c92e9ac8effb39582a9ca152f6795