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

Change-Id: Ic7238834c74c1d46a0372eaf5966c08bb4d20351