Merge "Revert "Frameworks: Translation Import German"" into kitkat