Merge "Check for null call id in ConnectionServiceWrapper"