Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 64465df428  -s ours am: cdb756273d  -s ours"