Fix race condition by guarding callbacks

Bug: 23587553
Change-Id: Ia71760013f3acbb5aeb4e30bb716683c9c672742
1 file changed