Merge "Use setChannelId instead of setChannel"
am: e9fb7cf1da

Change-Id: I95ea1141bd232f2656b2a222626201206f38f60a