Cherry-pick from master. Initial check-in to support multiple call channels. Change-Id: I387bab4d69ee38d738c5e0e0a51f1ac6607b9759
Cherry-pick from master. Initial check-in to support multiple call channels. Change-Id: I387bab4d69ee38d738c5e0e0a51f1ac6607b9759