Merge "Merge "Update VpnTest for new restricted API" am: 2954e8af am: 69dbb598 am: 5704beb4" into sc-dev