update from hltetmo

Change-Id: Ib077064f2b25a26e0cc6769976fda0b004befaa9