Torch changes

Change-Id: I4704534dc46548a08e8cdc200285c671630ff0ff