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

Change-Id: Ibb180b38c93aa33bf8e81737a360cd801d0eb953