am 7bdc151e: Merge "Import translations. DO NOT MERGE" into jb-dev

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