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

Change-Id: I3a315752493d9ed1ab20b4287b828c0cc11e7ef9