am 553ced65: (-s ours) am 4a27976f: Merge "Add tags around string formatting placeholders. DO NOT MERGE" into gingerbread

Merge commit '553ced659c99dbba81c1d5ab3ab1c176920d84b7'

* commit '553ced659c99dbba81c1d5ab3ab1c176920d84b7':
  Add tags around string formatting placeholders. DO NOT MERGE