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

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