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

Change-Id: I505d89ecfd486c1a1105bb2fe847d891ed540b6d