am d07c572a: (-s ours) am 06e1da6c: am 79361f84: (-s ours) am a97c5fbb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev

* commit 'd07c572a4e2b75bd27787020c31dcfe687245676':