Merge "Match getLegacyVpn calls to changed interface" into mnc-dev