Merge "Use Character.valueOf instead of new Character"