Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 040c26f636  -s ours
am: 8d2fceae4a  -s ours

Change-Id: I841376129cb7ebc1bcccde8d5b82b3b96e657513