Grouper removed Torch from Settings

Change-Id: Id0abe49c9b11c96820a7d378043955ddb7a95e74
Merge "Grouper removed Torch from Settings" into jb43