Merge "Fix LoggerTest."