Merge "Fix race when starting NetworkMonitor"
am: 78454f3c46

Change-Id: I3fe792704b9dfaafe09c83da57081d6668216a97