Merge changes I7ea39b80,I6b9979f3

* changes:
  Address comments on ag/10050681.
  Stop using NetworkFactory in connectivity code.