am a30d9694: Merge "Monitor the right interface re VPN" into jb-mr1-dev

* commit 'a30d969401a8533a5a341664421ba9b1e150bac3':
  Monitor the right interface re VPN