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

Change-Id: Ifc329644f6039a2563a8d49292f0d51faa12e2af