am f28c5393: Merge "Use an integer for the channel id."

* commit 'f28c5393890dfd7172abdc7c9213ca7c6ba50835':
  Use an integer for the channel id.