am 922ddb30: Merge "Avoid some unnecessary use of stl types."

* commit '922ddb30982d2597eab634d8b8598bec0eb7d3b7':
  Avoid some unnecessary use of stl types.