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

Change-Id: I9801796f6d742693b880a924a134a33053ddbd5e