Merge "Remove no-reply timer of CFNRy for certain carriers"