Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d
am: c15177b

* commit 'c15177b8b8f125c0c86bd7dabacde1289e68c45e':
  Remove trailing punctuation from recovery strings.

Change-Id: I2518baa5eb2be33da5f86d92e33b88a402724209