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

Change-Id: I595ecdbf0b8e91fec4287c3476239a1e6c9c80a7
tree: 6457708f97fa378efeab27a0733aa8fda5ebd717
  1. core/
  2. services/
  3. tests/