Merge "Promote ip-up-vpn into the framework."