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

Change-Id: I349aafcc9549cef99a669f05bd2e308efda5b62b