Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 5228e5d0cb  -s ours am: fb5fdf1012  -s ours"