Add multichannel support am: c678d51bdc
am: 9886d749d4

Change-Id: I00e53d56e7e98e54efa2e8f4bdc6928d125d0609