am 2306bec5: (-s ours) am 4ca5fbaa: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '2306bec5851265146cecd4d5fdf02c930697a453':
  Import translations. DO NOT MERGE