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

Change-Id: I6b70b44c5183430fc91c7e9f56a4a8d1c2e1924e