am 6c5f0019: am 571ffb54: am 922ddb30: Merge "Avoid some unnecessary use of stl types."

* commit '6c5f001967d348e58238505a4b4ba6a12193bba5':
  Avoid some unnecessary use of stl types.