Add locking to the backfill map

Change-Id: I523be0e21c865b53b177959e9e192041940ce997