Merge "Fix conference call duration issue"
am: c4a1ab0a73

Change-Id: I562d6d4ff8fdfc40ab44f1d12f486f11e8c7170a