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

Change-Id: I91759cf3b68f89500352c6d952643a45e0665ee2