Merge "VPN reconnection fails after manually disabling VPN" into nyc-mr2-dev am: bb08c408a8
am: 8580fda424

Change-Id: I6e6db06f61956ea1cee9d792bb4b3d812404a9d0