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

* commit 'e63c15dd64db9a823235e3eca7cf5bdff2bd2d2f':