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