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

Change-Id: I049ea18e6c5c42a1b31d93541aa3846b14b7ab08
tree: 4bc47bd172c0ac4d5f00c8ae8ad7400a61fe36f5
  1. core/
  2. services/
  3. tests/