Merge "Allow "LOCALIZED" and "UNICODE" collators."