Merge "Remove unused target legacy.test.stubs"