am fb6e234c: (-s ours) am adf64196: (-s ours) am 771a3a7d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'fb6e234c':