Use callId for all call commands.

Change-Id: I988643cdaaffb1abf2689844d119d5e382b9791b
3 files changed