Torch changes

Change-Id: I8cc036d87fecbb4ab0af3d3205d2ef763be54b8a