Merge "Hard deprecate UtfNormalUtil"