am 8e1bf9f1: (-s ours) am 43ba3ba4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '8e1bf9f1': Import translations. DO NOT MERGE