Add back headers for lights

Change-Id: I2a46532b10a6f0b953986cf46878f4116956606e
Remove support for Torch, we use LightBulb

Change-Id: Icaede79699148ee46d644e8ac35960fc47974650