Merge "Restore LOG_NDEBUG condition on verbose logging."