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

* commit '7fcea3eeccccebe5a1dabcbc15c488116b7bde8e':
  Import translations. DO NOT MERGE