Merge changes I982543cd,I41c3bf6c,Id3e5f6e1

* changes:
  Add a provider to VPN
  Small VPN cleanup
  Migrate VPN to the public NetworkAgent API.