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

Change-Id: I4970cf8816ce5360b8e6340ae5774ccbd58bb4bc