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

Change-Id: I5a9a2d1225ecd54babcdede2bb2d283c5a3f5a5a