Merge "Revert "Add unit tests for IKEv2 VPN setup and MOBIKE""