Merge "Switch Percent tests to activity rules." into mnc-ub-dev