Merge "Remove wrong usage of DoNotTranslate"