Merge "Adding support for Cdma conference calling." into lmp-dev