am 3c541e34: Merge "Simplify GenConstString"

* commit '3c541e3438c2ec4f0acc9c9023a1f8644e2458ee':
  Simplify GenConstString