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

Change-Id: I16ea34198d95d7da16a3a07cf0da1aa9b2b3304e