Merge "VPN reconnection fails after manually disabling VPN"
am: ba17ea752b

Change-Id: I8ff02f8d1fe4989cb92949ab85aade598c8cff00