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

Change-Id: I61f891e2212e45fdeedc0daea7e620d812874d50