Merge "StringUtils: Fixup Doxygen warnings"