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

Change-Id: I54e64200e282e643df107bd209ba1b913fc84ea3