am 7256942b: (-s ours) am d01ca3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev

* commit '7256942bb757bfaa14db128386c0ecb363b26935':
  Import translations. DO NOT MERGE