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

Change-Id: I049ea18e6c5c42a1b31d93541aa3846b14b7ab08