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

Change-Id: I903ece25c820b81b26bff35e8c09f0e126ea32c1