Merge "Fix the backups example to use a simpler lock."