Merge "Fix race when starting NetworkMonitor"
am: ef8485cc65

Change-Id: I3fe792704b9dfaafe09c83da57081d6668216a97