Torch changes

Change-Id: I46725dfba447bec3ab352bf88f2431fcb5ca7bea