Merge \"Update a string.\" into nyc-mr1-dev
am: dca2b18c15

Change-Id: I9366b0d0baadd818c40a58cab7ffeafe8a2148d5