Merge "Fix to enable negative test image_invalid_metadata"