hlte: Fix merge fail.

Change-Id: Ic3d337832c587eab65395df8796efb31eef4ac9d