am d866c761: Merge "Add OOME try catch around gc-thrash dive logic"

* commit 'd866c7616cb3426c431b635ae69964ce69c2ecb5':
  Add OOME try catch around gc-thrash dive logic