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

Change-Id: I8bc54083c553844ec2c8a65858f4b305fa30cf82