am 116b9336: (-s ours) am bb9360e3: (-s ours) am 63069cc9: (-s ours) Import translations. DO NOT MERGE * commit '116b9336': Import translations. DO NOT MERGE