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