am 3e336bd6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '3e336bd6467c3a518b408d6b79117ae507a3c41b': Import translations. DO NOT MERGE
This commit is contained in: