Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: fd92981842  -s ours

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