Merge "Remove deprecated utfnormal back-compat"