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

Change-Id: I822296d354d433bb7cb26583fed41a31ef4f5825