Merge "Fix conference call duration issue" am: c4a1ab0a73 am: 7fc24728cc am: 8590508144
am: 3a4da507fd

Change-Id: I346dae1f12e6b3ec9a68f89aaa1f782b31c81a7a