Merge "Prevent re-adding call disconnected before block check completes." into nyc-mr1-dev am: 66cd16e92f
am: fa16f6201e

Change-Id: I38ee745373de7e8948abf5b01a5a41131b1f5bef