Move to @same for products that are on the same release cycle
(cherry picked from commit d22a666ecc73f0ae038802fb3547fae7833c1025)