Merge "Fix flaky testNattSocketKeepalives"