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

Change-Id: I09b763b7813ee0af1912dee1cfbc58b40ff377e4