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

Change-Id: Ia075c63765f2505b5371df741478936acab6fe14