Torch changes

Change-Id: Ib846f2dd1003fa451a463347c9f5905c84267565