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

Change-Id: Ic6c5ebc4242cdf2033a0fd272b842de1f482b396