am 1ce0dfd8: Merge "Reformat and remove STL reference from header"

* commit '1ce0dfd82311d4922dbffdde302599410fc25c5d':
  Reformat and remove STL reference from header