Merge changes I97015365,Ic9db4b9b

* changes:
  Add NattKeepalivePacketDataTest
  Add KeepalivePacketDataTest