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

* commit 'eb2af6d3baf9c731a1a904ed5837c71837d5b61a':
  Adding SmsTest to emulator