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

Change-Id: Ic863b2b0842a28083ff552f584414a639f7ad277