am 7aa56efd: (-s ours) am 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '7aa56efd': Import translations. DO NOT MERGE