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

Change-Id: Ib818fb98b6c01ef041cf6339c590b3f3185553ca