Merge "Fix last direct usage of UtfNormal in MW core"