Merge "HostStubGen: Make sure substitution methods have right visibility" into main