Merge "Don't run different user test on R for now." into sc-mainline-prod