Merge "Workaround for tradefed's silent failure issue" into main