Final Commit for SMS Tasks implementation

Change-Id: Ibb5f1bdf4a6cc03b0000c847fda779774bc69668