Merge "Revert "Import translations. DO NOT MERGE"" into oc-mr1-dev
am: 62f46d483b  -s ours

Change-Id: I81b76102be9a4bcc69763572a9c438497245940b