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

Change-Id: I86fe5f301b4a58111949d25700669f55b0d587cb