Merge "bug:3514023 fix strings" into honeycomb-mr1