Merge "Fix flaky test in NattKeepalivePacketDataTest"