Merge "Fix for busted call duration in CDMA conference" into lmp-dev