am: 97e106b3 * commit '97e106b3': Do not use EXPECT_DEATH in unit test, fails on device. Change-Id: I7f53ef9369c9aa349449a49649a661d968e17c5d