Not sure about this change. Is a type that is otherwise stable, but which implements an @Incubating interface, then an incubating type? For example, say we're extracting an new API from an existing stable hierarchy. The existing classes aren't really incubating - only the new methods they pick up from the new API are incubating, at least in the sense that they are the only things that we intend to change.