am 033168b1: Merge "Lockdown VPN handles its own connection teardown." into jb-mr2-dev

* commit '033168b1b0e6fc24a01bef6ec65948663f0ad3b7':
  Lockdown VPN handles its own connection teardown.