Merge "Revert "Move all sms tables except raw into credential encrypted storage.""