Merge "use passed blk dev name for quota / super block check" am: 7b706c5b9e am: 2f3718c472
am: d31f3a0e9b

Change-Id: I0031690605466dcf7600c162565be5f6d6fd44cf