Merge "Switch Block::purgeExpired to use AutoCommitUpdate"