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

Change-Id: I29a6575bcf39b779021f9e3bb84297a951d74ac8