Manjyot, Sandeep| Fixing smoke test i.e commenting code to save R&R  for a time being