Merge "Fix NAN-related VTS tests."