Merge "Revert "Temporary fix for sms cts regression""