Merge \"Catch additional OOME in ThreadStress.\"
am: 9a8620e45e

Change-Id: I0b4fbd2e578194a357be4d9ed7479c7cf8220a3f