Merge changes I31d5260d,Ied92f558 into nyc-dev

* changes:
  Start VPN as early as possible during startup
  Split network agent created state from connected state