Merge "Fix invalid negative native wait tests."