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

Change-Id: If202bef8ea4514c9eed89f9c33094b0427c26f04