Merge "Fix Cdma conference cleanup bug." into lmp-mr1-dev