This function returns the complete block device record, not just number.
Fixes regression in 89bc73aa01.
Also fix the incorrect job in the gate queue, which prevented us from
catching this issue on merging.
Change-Id: I4cbc359ceabfc193ce18fed14a1952359460e7d9