Merge "Import translations. DO NOT MERGE" into oc-dev am: 88e9aa19e2  -s ours
am: 8b44d3722d  -s ours

Change-Id: I0dd1d3f0f62fa0a7c7379259f15f07e4f7e98a10