Merge "Import translations. DO NOT MERGE" into oc-dev am: 728c610446  -s ours am: 1de3fd81e0  -s ours
am: de19b85c6c  -s ours

Change-Id: I2db346eda1e5abd2ddfffc6b19fc5c5eae1d3f57