Torch changes

Change-Id: I29f595cf2927600e796ec8e8a3753509637addf5