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