Remove modification related DEATH_TEST. am: d2e5e07e17
am: 012d764c1c

Change-Id: I509ede637f8af3b5ff2ed2e4b5cba17294ccf23d