Merge "Fix multiple substitutions specified in non-positional format." am: f5734617f1 am: 0d24619ce7
am: a96a64d677

Change-Id: Id9e3ba23273554bd8ea97b5e0210ab58c3f3102b