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

Change-Id: I03e1afca96b26a9bd4f6f14f745d02aab99a3742