Merge "Enforce assumptions around metadata_block_device"