Import kltedv from Team-Hydra

Change-Id: Ib8dde1ae207e92778353a149b272814a27045435