Merge changes I97015365,Ic9db4b9b

* changes:
  Add NattKeepalivePacketDataTest
  Add KeepalivePacketDataTest
tree: c6db9dd821f9ba1490180ce66c959e27d50d4a4d
  1. core/
  2. services/
  3. tests/