Merge "Remove usage of StringFactory"