Optimize for d2kdi

Change-Id: I86fdfc15f6a3c4ae8014c6604114b247247cbe51