Add kltedcm and kltekdi support

Change-Id: I38bf628e346f9c7070df02c3af77366bb5b2eefc