Merge "Fix TextClassificationTest#testToBuilder" into sc-dev