Merge "Legacy VPN calls to require a userID" into mnc-dev