Merge changes from topic "add-ikev2-vpn-types" am: adb79e3b39 am: 6e1557d8ca am: 53133f708e

Change-Id: I4ff406efcaada5a9306afc79290cb37bdeef71f2
tree: 3184b85e7024e65bdf2aa4211461197b6b8ce55a
  1. core/
  2. services/
  3. tests/