Merge \\"Update strings to match the latest mocks.\\" into nyc-mr1-dev am: 7a23b48266
am: b582e1c7de

Change-Id: Ib45c94ed413c4e096c69c18c2125fbb67b22f2f2