Merge "Ensure CallId is not null when connection creation is complete." am: 47b23176bd
am: 5458f38518  -s ours

Change-Id: I9152a42c8e0bbb766a22f69480748a6534e993bc