Merge "Rename mChannels to mChannelMask" into mnc-dev