Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 921a346  -s ours am: efd58d9  -s ours
am: 3385329  -s ours

* commit '3385329d60daa9cbe0f437fc83eb9061f0b8a5ae':
  Import translations. DO NOT MERGE