Fix tests: No dangling annotations in stubs
Buildserver auto merge