am ee4b3e64: (-s ours) am e5fd5ea5: am dbba676c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'ee4b3e64': Import translations. DO NOT MERGE