am 9641feee: (-s ours) am 38499cf8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '9641feee025cfd669cd4730bb0609ba16aaffc2a': Import translations. DO NOT MERGE
This commit is contained in: