Merge "Use setChannelId instead of setChannel" am: e9fb7cf1da
am: 7c9488ae79

Change-Id: Ibc0722b84e3fd5d8cde47747a5a001e325673c7f