Merge "Merge "Update VpnTest for new restricted API" am: 2954e8af0f am: 69dbb598f9 am: 5704beb453" into sc-dev