Merge "Fix incorrect reference in java.lang.Character"