Merge "Adding SmsTest to emulator"