Merge "updater: erase ignores EOPNOTSUPP for BLKDISCARD"