Merge "Add cleanupCalls to call tracker." into oc-dr1-dev