am 064649ef: (-s ours) am d9730390: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '064649ef3b7f2d187b233069d1580ff81b9b29e6':
  Import translations. DO NOT MERGE