Bug 18925: (QA follow-up) Make DB update idempotent