Merge \\"Fix StringReferenceValueComparator.\\" am: 8543d324d1
am: 88ca66a386

Change-Id: I82d33dece4ea64aed7ce428200b9cf7658bfcf8d