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