Merge "@Ignore is unsupported on classes and confuses TH flake monitoring."