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

Change-Id: I1fe183d10ca853a2b54910bf9f65725e5146791e