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

Change-Id: I440f96d5e3306db73a9e7f75661d2a400bc49e46