Merge "Reformat and remove STL reference from header"