hlte: unified

Change-Id: I2ba7d7ec4ab5f64924cdd18bd2a068d4578d5d4b