Merge "Remove discoverable timeout handler."