Merge "VPN reconnection fails after manually disabling VPN" am: ba17ea752b am: 92d16f70d7
am: f9c48fad75

Change-Id: If2b80355bc3ebee6723a1f9b49bce1d267f0a085