Merge "Import translations. DO NOT MERGE" into oc-dev am: a0376f250f  -s ours am: 503eab4469  -s ours
am: ded6d159cc  -s ours

Change-Id: I4aeb90be346036977929a62605b5c82050cbb36a