Return both disk and partition from lookup_disk

Change-Id: I7f8f5dc981adf0e4c3ab63424fd08d8aecbb5774