Merge "Fix bug 4211099 channel constants and 7.1 mask"