Merge "Move NattKeepalivePacketData out of the framework"