de-unify HLTE

Change-Id: I62f81a044bed1a93f7811e526649667ef08ee561
Merge "de-unify HLTE" into kk4.4