Merge "Fix locking issues with proto dumps"