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

Change-Id: I0dfea4c7aafd2b62aa5f57a643c952ef89b2f2e9