Bug 23321: (QA follow-up) Make atomic update idempotent