am 71915a37: Merge "Fix string iterations in a couple places."

* commit '71915a372209616850e053bc5ac82eab26c170ba':
  Fix string iterations in a couple places.