am e33f6d36: am e3304327: Import translations. DO NOT MERGE

* commit 'e33f6d36f0142050b29e2243c08b90d2d8683fb6':
  Import translations. DO NOT MERGE