Merge "Update strings to match the latest mocks." into nyc-mr1-dev