am e9f69e16: Merge "Move a generic string utility to StringUtils"

* commit 'e9f69e166109e46cf1685418fb0ed8119575689f':
  Move a generic string utility to StringUtils