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

Change-Id: Ia7ce47824a9610e28c7b333e3d6b4e7a73872fa9