Merge "Have CloseGuard report by default"