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

Change-Id: Ie9c97e96908f2552ec64910eac8dd3d8aff45500