Flo removed Torch from Settings

Change-Id: I14659a961a8feace1502be73edd0271b4c66c68a
Merge "Flo removed Torch from Settings" into jb43