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

Change-Id: Iae37512ab87cd39c76c8570857a4538a4a12faba