Merge "Revert "Import translations. DO NOT MERGE"" into oc-dr1-dev am: 2dc7e093b4  -s ours
am: a8d17297aa  -s ours

Change-Id: I1b4100d82cad3478b07e103c612ec2570f8a7911