Merge changes I40241276,Ibbd47582 into main

* changes:
  Remove unused variables
  Remove the SDK check and update test runner