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