am cce9728e: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'cce9728e2b838642c85e30978854793b481954d2':
  Import translations. DO NOT MERGE