am 22b41b0c: (-s ours) am 178807d5: am d6696b7c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '22b41b0c0909c89031d165f7bed3d2016f930033':
  Import translations. DO NOT MERGE