Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 93e8800b21  -s ours

Change-Id: I54abc5cc4a026d0ec271d8d01989ab8ec944f4b7