Merge "Import translations. DO NOT MERGE" into oc-dev
am: 7fc501184a  -s ours

Change-Id: I62669a422c38856f0d164a149f6415e59e2b81d4