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