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

Change-Id: I9421633931117831b781f6c6c26ea218a5d1f691