Merge "ip-up-vpn: Fix resource leaks in error cases"
am: a5d85affa9

Change-Id: Id6a1442dd9226b50a392aca2d484afd357bcabd9