Merge "Update scrubClass() to match CoreTestRunner."