Merge "StringReference comparator operator is missing const"