am 94496184: (-s ours) am 7a42c809: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev

* commit '94496184577381503d4771f13fc9d862d4b213db':
  Import translations. DO NOT MERGE