am 71dee16b: Merge "bug:3514023 fix strings" into honeycomb-mr1

* commit '71dee16bc9683d1dd768c852e12911c72e471544':
  bug:3514023 fix strings