Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 38f33925f8  -s ours
am: 0ba5990d99  -s ours

* commit '0ba5990d99fe96e5c6c1b864c4a23899be8b258a':
  Import translations. DO NOT MERGE