Merge "Fix StringReferenceValueComparator."