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

Change-Id: Ibd0e8ee093e55246bbf7c541be34933ef55cec0a