Merge "Remove xx-uca-et collation workaround"