Initial check-in to support multiple call channels. Change-Id: I7c5147c57077d024bacd4f68938d249219eb0011