klte(,-common,spr): squashed muppets updates/deunification

Change-Id: If2ce211a1e33dee10ea553774a4f9239cde70265
kltevzw

Change-Id: I5202a56ce37204cfc32f91ea4d9bcb5ae886ea90