Merge "Force 7 but sms encoding for Vodafone Spain & Portugal" into lmp-mr1-dev