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

* commit '4943af9f71f0dc273c05de0d67dc23495748c5c1':
  bug:3514023 fix strings