Merge "Do not use EXPECT_DEATH in unit test, fails on device."