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

Change-Id: Iba3d1a9d89986f3bbfb8618b780852829df558d3