Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 33393ffa7d  -s ours
am: 7828d152d2  -s ours

Change-Id: I9c7cc987a58510ae3da905f825bf5edf81c63c44