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

* commit '571ffb54de2b693476e7c47cf2db13eab6d8929c':
  Avoid some unnecessary use of stl types.