merge the kernel debug collect option from r22327