Handle toroplus bottleservice taint gracefully

Change-Id: I1a2c61e7bfdefdebc0164ef7ab4962dc64d443c7