Merge "Make pre-commit DB callbacks more atomic with multi-DB updates"