This enables getting channel index masks and is future-friendly. Change-Id: Ia0bb9a855e97e8279b2226cf75e0ddd03af3fb7f