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

Change-Id: I7e58f8e27052c54c02dbaa9c8430d1e97c4cf3c4