Merge "Fix vts-hal-auto test"