Merge "Import translations. DO NOT MERGE" into oc-dev am: 023c36f89f  -s ours
am: 466cbb6daa  -s ours

Change-Id: Ibf6ead452623d83ed672e9355aa294f49325fac7