Merge "HostStubGen clean up." into main