Merge "collation: Remove suppressWarnings() for getSortKey()"