hlte: fix mismerge after cleanup

Change-Id: Ia53af26e3c0827dec49dd591f7204a0cdaf3c3c8