Merge "Speed up test 080-oom-throw"
am: 2b864659d4

Change-Id: Ida42e33ff99b97fb051497d8bd8e3229f1285688