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

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