Merge "Add tags around string formatting placeholders. DO NOT MERGE" into gingerbread