Merge "Fix capitaliation of UtfNormal namespace"