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

Change-Id: I5fbec805a089d660f4b34dc2d2f232e12f248d01