Merge "Speed up test 080-oom-throw"