am 6fa831b7: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '6fa831b764fc7d062d95404f26de7b5fde1a5a73':
  Import translations. DO NOT MERGE