Merge "Ensure CallId is not null when connection creation is complete." into oc-mr1-dev
am: 9ad54229f5

Change-Id: I1de7a0a4cc9c630019e38b8154bfc1d470f56ae3