Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 812794f0f5  -s ours
am: 6dff6bc8cd  -s ours

* commit '6dff6bc8cde0f71752880b2495d65bd744c11060':