Merge "Update USB channel mask handling" into mnc-dev