Merge "Fix race when starting NetworkMonitor" am: ca5b44477a
am: 9e85030e71

Change-Id: I049ea18e6c5c42a1b31d93541aa3846b14b7ab08