am 47ae0b93: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '47ae0b93c3a3b4fcb32cd46ad3b8313959344912':
  Import translations. DO NOT MERGE