Merge "Fix ext4/metadata/udc issue"