am cd5e3f85: (-s ours) am da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit 'cd5e3f85': Import translations. DO NOT MERGE