Merge "Fix carrierconfig shell command is not working when slot is specified"