Merge "Make legacy VPN work over stacked interfaces."