Merge "p970: Enable Torch" into gingerbread