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

Change-Id: I3fef7e2901e1d98ef1457b0e6ebee689e7b721d5