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