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

Change-Id: I9e903fa0986f1ae2edb84e01ec1e7ff5985f47ca