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

Change-Id: Ib6905c29f41aaea8c779f1771793da0daa2326dd