am 6f698156: (-s ours) am ee63d2f1: (-s ours) am 8e3f5ce1: (-s ours) am 73cbb981: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '6f698156':