kill switch

Change-Id: Icec23d0a6c0474b1ea24c158d6e4010b393133ef