Merge "Clean up 669-moveable-string-class-equals."
am: a051f29bbb

Change-Id: I70fb5cea52e49ab66256b1ea8577bb7f9005ba4e