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

Change-Id: I7dd0d63dbe81bdf253aa6a60a3c2a62082af4479