Merge "Fix to handle duplicate call id for conference call" am: e31b09c825 am: 8d54779726 am: 5b07e901bf

Change-Id: I0986961bc1d08079b2fada7d9615133a954c26fc