Merge "Extract nested types from BaseClientMonitor."