Merge "Mask 0xA807 channel for KDDI"