tombstoned: silence spurious error messages. am: 8498016b81 am: 8fb50dc76c
am: 44877b9c29

Change-Id: I32f8ec5c1335589ba5999bb0377c7ad6b6d4d1e4