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

Change-Id: Ia13ce090bb9dec76b193e2cd394f8a375a2bd166