Update TMH for cherry-pick

Change-Id: Ic18b89ecf0d1eb376d827486c821c08055b46222