Merge pull request #20037 from yglazko/fmd_erase_fix

Bug 1020580 Proposed Fix for FMD Erase Not Working