kill bugmailer some more

Change-Id: I196736391dd6c5dc7e9d3134c56b83bb340c3888
build barrier

Change-Id: I8895980bcad18e2591249ca72d2d2b1eb25775d5