Add multichannel support
am: c678d51bdc

Change-Id: I3a3221dfecc6374b58db5bed32b7dd08d23bf2cb