Merge "Fix validation URL flakes with DeviceConfigRule"