Prevent inter-bottle-service taint

Change-Id: I9e5593ca3f67e4cf9b8b31936b433ce9e1144445