Merge \\"Fix 004-ThreadStress.\\" am: 99376148af
am: 1171e22d7c

Change-Id: Id648563e739da8cf70acb1d2aead055eaac46582