am 151b9a40: (-s ours) am e6911748: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '151b9a404bf9ad50469fb9f0aa07f745928fc33b':
  Import translations. DO NOT MERGE