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

Change-Id: If19e88be06d1d63955c7213c95dff59056a86c88