merge from hlte

Change-Id: I859313f2c4863fb58cd478f21112e124d65f55c4