Merge "VPN reconnection fails after manually disabling VPN" into nyc-mr2-dev