Merge "Allow channel count modification on userdebug"