am 988d848b: (-s ours) am cb928e27: am 2e3f261d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '988d848b': Import translations. DO NOT MERGE