Merge "Silence ulimit in run-test" am: d5482fe89a am: 96f707ceae
am: e861257190

Change-Id: I69d27b42599c3e6052ad069d15a58bf5d2a3f5ec