Merge "Removing @Stability flavors for unbundled." into sc-dev