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

* commit '4eec72d2cf8c1be0068feffc804035dab756c78d':
  Remove trailing punctuation from recovery strings.

Change-Id: If9529323c0933f88f8d28a450589d2864af19ad2