Unify HLTE

Change-Id: I51374214219f16d72c8f8046aa88c0d2dd732a48