Ignore 404 on deletion

Change-Id: I5a70875a2e3fcc1b945ce998eb85edd3cb037cee
Closes-bug: #1314304
Merge "Ignore 404 on deletion"