Merge "Expect less in the presence of a string init call."
am: 26962cc2a1

* commit '26962cc2a1e773e99c1711bef9b36e199fdc8989':
  Expect less in the presence of a string init call.