am 8a3eb664: am 435c0374: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit '8a3eb6644cc99cd991319dc487446689eb0907e8':
  Import translations. DO NOT MERGE