Merge "Update VpnTest for new restricted API"