Merge "Make gc-thrash able to handle OOME"