Merge "Make sure the right NetworkMonitor start method is called on S-/T+"