Fix Push update race condition (#13562)

Change-Id: I50094bc2d236f6dbb02a8b82d6cc9b5f7e4733a5