am cc4bee55: am 8fcad020: Merge "Make legacy VPN work over stacked interfaces."

* commit 'cc4bee55fa58193073f5ba5ccebc0cc24fdb45c7':
  Make legacy VPN work over stacked interfaces.