Merge "Updating APIs for CDMA conference call support." into lmp-dev