Unify HLTE

Change-Id: I2bf0b333b44cd5142b77b7dfb289be81bf6497d3