Merge changes from topic "add-ikev2-vpn-types" am: adb79e3b39 am: 1ebbd0bb6b am: bb3d6e2e9c

Change-Id: I4ff406efcaada5a9306afc79290cb37bdeef71f2