Merge "Fix to handle duplicate call id for conference call"
am: e31b09c825

Change-Id: I4c9812fcde1a73389e3ded89280e9084ec83aaf7