Merge "tests: Specify the death test style to avoid flakiness." am: 878d5a77f0 am: d770790a8f
am: 34a7cdc8ce

Change-Id: I2b1b39d5bd47744d102b55736730348a94cede7e