Merge "Don't disconnect data for some carrier" into lmp-dev