Changes to support multiple channel ETPU.