Merge "Clear the calling ID in dump()."