am 53ee14a1: Merge "Avoid inliner spam wrt String.length."

* commit '53ee14a160fba2c71b811c97268400c50eb08249':
  Avoid inliner spam wrt String.length.