am 62de7421: Merge change I4fe2a47a into eclair

Merge commit '62de742125d8f5fd1d236f720b2de3bf5cf76174' into eclair-plus-aosp

* commit '62de742125d8f5fd1d236f720b2de3bf5cf76174':
  Fix stopping all vpn daemons before connect and more.