Merge "Update DisconnectCause conversion for IMS merges." into lmp-mr1-dev