Merge changes Ib7ca9618,Iee223c5d into main

* changes:
  [HostStubGen] Remove stub usage in HSG tests
  [HostStubGen] Multiple improvements