Merge "Fix multiple string substitutions"
am: 95108c9e8a

Change-Id: I8adf25e224f5e613d3154dc8b4f0434d1551bd1a