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

Change-Id: I44e62e4825b52be0ec277f1b77421cd4997bb2f9