Merge "updater: erase ignores EOPNOTSUPP for BLKDISCARD"
am: 08a8b40c91

Change-Id: Iee6860b0dbeaafc06ca881148ca4ea99abaf4b3a