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

Change-Id: I24a1f92821c0bd204eb25f0aaa4e46a962565291