Optimize for hltekdi

Change-Id: I4e1010b4359ea638ff82e7d143d5cb63e49702f6