am 1f055fa8: am eb2af6d3: am a775c5a0: Merge "Adding SmsTest to emulator"

* commit '1f055fa84529d22891fb8d1b55ef3f93d61771cd':