Update TMH for cherry-pick

Change-Id: I129350fd1dc1caa2b2374a83a81555cc01a061c8