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

Change-Id: Ie45f9019bf8189029efc74d1a09dce5e62c923d4