Merge changes I97015365,Ic9db4b9b into rvc-dev

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