Merge "Add eraseblk and logicalblk fs_mgr flags"