Merge "Add channel index mask for usb output" into mnc-dev