[release/9.0-staging] Switch to non-incremental servicing

[release/9.0-staging] Switch to non-incremental servicing #7858