Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 4c44a3059c  -s ours

Change-Id: I0474490ef308e2df768be086ad76e8aae671891d