Removed dependence on SMW in order to run

Change-Id: I3b90c23f10a1465502c537db9eb91125eba34000
Merge "Removed dependence on SMW in order to run"