Merge "Experiment with ulimit settings to see if it fixes test failure."
am: a04d4f07f3

Change-Id: Ifc4dd07adbac0ad8b970aca5e41c49beb18faf1a