drop flashlight for torch

Change-Id: I430af1c0fd62bbdd370883c3b6394b552b8a15fa