am 2e4cf921: am 34ed21c5: Shortening a string.

Merge commit '2e4cf92179763ba09347deb214d3688be66971e7'

* commit '2e4cf92179763ba09347deb214d3688be66971e7':
  Shortening a string.