Merge "Revert "Disable verbose logging.""