am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '7d5fb3a9430550a3ccf1ed5afd70dbf8cc81574a': Import translations. DO NOT MERGEmain
commit
ef1cb855a8
* commit '7d5fb3a9430550a3ccf1ed5afd70dbf8cc81574a': Import translations. DO NOT MERGEmain