Merge "Make 624-checker-stringops less Dexer-sensitive."
am: 97785f595a

Change-Id: I15821b2894b70492a8d71672d8397675cadf43fb