Make sure channel ends with -channel. am: ce3f7cf69f am: 1cc121bf92
am: 1c191eb486

Change-Id: I3900540cadf0517b6a020590bb88b027cdd032e6