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

Change-Id: Ibcfec15a4022a9639299756aa2fdcd6f03b532b5