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

Change-Id: I7dd0df6adbe7315326064e5b660432dc60be6495