am 8e7b964b: Merge "Handle OOME during threadstress finishing message"

* commit '8e7b964be2fab9b6bbb30cf8897617424d0fe85f':
  Handle OOME during threadstress finishing message