Syncing the bug fixes that went in vpnservice after the initial porting of