Merge "Fix multiple string substitutions"