Merge "Randomize using old or new chips for A/B testing." into ub-gmail-ur13-dev