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

* commit '5ca4da495123598fcc6cc0db249fa4a266bfe140':
  Handle OOME during threadstress finishing message