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

Change-Id: Ia2a19ee272cfbf4c8266704fe158c15fed8a1669