Merge "bug:3514023 fix string formatting" into honeycomb-mr1