Make sure channel ends with -channel.
am: ce3f7cf69f

Change-Id: I17ad03874f48ff9419b829a996133ccf37a3a854