Merge "VPN reconnection fails after manually disabling VPN" am: 34538ca099 am: db75984fe5
am: 7f8f84f958

Change-Id: Ie0c657338bb144543339236a22c7577dc4d0bfe5