Merge "Make 624-checker-stringops less Dexer-sensitive."