Fix concurrency issue in DBEntryBase removal

Change-Id: I10e9822f1a100a9739624f3e49c05ccf89018a34