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

Change-Id: I5c909bf0c13581379f08f21394c1c3221944c93e