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

* commit '07f0912fe6bd5d4971ceb497e9b921ce20e6d9db':

Change-Id: I5560b9d38eff7995047d08a9d81736148710eebe