Merge "Unhide APIs for user space VPN."