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

Change-Id: I315ce05d3563cb167177e3908709950300591405