Don't redlink deleted items

Bug: 65002
Change-Id: Ib9b6e8a0d9f55e958f54f02c5cb6bca7d2c28de3
Merge "Don't redlink deleted items"