Changed blocking bug for 26997 as well as the test code to kill just the sms app.
Merge pull request #161 from roydude/v1-train

Changed blocking bug for 26997 as well as the test code to kill just the...