Merge "Fix String::DoReplace() using obsolete `this`."
am: e9cd81c146

Change-Id: Ib9d39aa1d939870ec3d8b0c583aa2390f76e30f9