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

Change-Id: I6e203b49328a8ad3dccde04b12494a7fd7f2620d