klte: partial deunification

Change-Id: I9215f42bac9855f749b90ec681b7e9681d4911d8