Merge "Revert "Unhide APIs for user space VPN.""