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

Change-Id: I73cc598b4dbed1aec06484335a0589692fc85b2b