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

Change-Id: I3ef9b10752dc0e2f1f31bc3b2bc65e1886438c42