Merge "Fix race when starting NetworkMonitor" am: ef8485cc65
am: ea71c49a0e

Change-Id: I049ea18e6c5c42a1b31d93541aa3846b14b7ab08